rework is ready

Author: GuillaumeRx

packages/snaps-controllers/src/snaps/SnapController.ts

@@ -1346,9 +1346,6 @@ export class SnapController extends BaseController<
    * runnable Snaps.
    */
   init() {
-    // Lazily populate the `isReady` state.
-    this.#ensureCanUsePlatform().catch(logWarning);
-
     this.#setup().catch((error) => {
       logError('Error during SnapController initialization.', error);
     });
@@ -1369,6 +1366,8 @@ export class SnapController extends BaseController<
         await this.#handlePreinstalledSnaps(this.#preinstalledSnaps);
       }
 
+      await this.#platformIsReady();
+
       this.#controllerSetup.resolve();
     } catch (error) {
       this.#controllerSetup.reject(error);
@@ -1765,11 +1764,15 @@ export class SnapController extends BaseController<
    * Waits for onboarding and then asserts whether the Snaps platform is allowed to run.
    */
   async #ensureCanUsePlatform() {
-    // Ensure the user has onboarded before allowing access to Snaps.
-    await this.#ensureOnboardingComplete();
+    await this.#platformIsReady();
 
     // Ensure the controller has finished setting up.
     await this.#controllerSetup.promise;
+  }
+
+  async #platformIsReady() {
+    // Ensure the user has onboarded before allowing access to Snaps.
+    await this.#ensureOnboardingComplete();
 
     const flags = this.#getFeatureFlags();
 

packages/snaps-controllers/src/test-utils/controller.tsx

@@ -25,7 +25,7 @@ import {
 } from '@metamask/snaps-rpc-methods';
 import type { SnapId } from '@metamask/snaps-sdk';
 import { Text } from '@metamask/snaps-sdk/jsx';
-import type { PersistedSnap, Snap } from '@metamask/snaps-utils';
+import type { PersistedSnap } from '@metamask/snaps-utils';
 import { SnapCaveatType } from '@metamask/snaps-utils';
 import {
   getPersistedSnapObject,

yarn.lock

@@ -4269,11 +4269,8 @@ __metadata:
     "@metamask/snaps-rpc-methods": "workspace:^"
     "@metamask/snaps-sdk": "workspace:^"
     "@metamask/snaps-utils": "workspace:^"
-<<<<<<< HEAD
-    "@metamask/superstruct": "npm:^3.2.1"
-=======
     "@metamask/storage-service": "npm:^0.0.1"
->>>>>>> 57095fea (Add `StorageService` and handle preinstalled snap setup in `init`)
+    "@metamask/superstruct": "npm:^3.2.1"
     "@metamask/utils": "npm:^11.8.1"
     "@noble/hashes": "npm:^1.7.1"
     "@swc/core": "npm:1.11.31"