From 70842176f6d3cf106a29e5237197b44bb9c9fd05 Mon Sep 17 00:00:00 2001 From: James Babcock Date: Fri, 11 Sep 2026 23:19:13 -0700 Subject: [PATCH] Clean up the copy through the onboarding flow --- app/phone-ui/onboarding-firmware-check-view-model.ts | 4 +++- app/phone-ui/onboarding-flash-page.ts | 4 +++- app/phone-ui/onboarding-flash-view-model.ts | 8 +++++++- app/phone-ui/onboarding-unpair-page.xml | 2 +- app/phone-ui/onboarding-view-model.ts | 6 ++---- app/phone-ui/pairing-view-model.ts | 6 +++--- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/phone-ui/onboarding-firmware-check-view-model.ts b/app/phone-ui/onboarding-firmware-check-view-model.ts index 60182bde..6916d7e9 100644 --- a/app/phone-ui/onboarding-firmware-check-view-model.ts +++ b/app/phone-ui/onboarding-firmware-check-view-model.ts @@ -328,7 +328,9 @@ export class OnboardingFirmwareCheckViewModel extends Observable { this.disposeProbe(); Frame.topmost()?.navigate({ moduleName: "phone-ui/onboarding-flash-page", - context: { mode: "install", fromOnboarding: true }, + // This page already described the install; skip the flash page's + // intro/"Connect & Confirm" step and connect immediately. + context: { mode: "install", fromOnboarding: true, autoStart: true }, }); } diff --git a/app/phone-ui/onboarding-flash-page.ts b/app/phone-ui/onboarding-flash-page.ts index 01d989c1..70484d5f 100644 --- a/app/phone-ui/onboarding-flash-page.ts +++ b/app/phone-ui/onboarding-flash-page.ts @@ -5,10 +5,12 @@ import { FlashMode, OnboardingFlashViewModel } from "./onboarding-flash-view-mod export function navigatingTo(args: NavigatedData): void { const page = args.object as Page; if (!page.bindingContext) { - const context = (args.context as { mode?: FlashMode; fromOnboarding?: boolean } | undefined) ?? undefined; + const context = + (args.context as { mode?: FlashMode; fromOnboarding?: boolean; autoStart?: boolean } | undefined) ?? undefined; page.bindingContext = new OnboardingFlashViewModel({ mode: context?.mode ?? "install", fromOnboarding: context?.fromOnboarding ?? true, + autoStart: context?.autoStart ?? false, }); } } diff --git a/app/phone-ui/onboarding-flash-view-model.ts b/app/phone-ui/onboarding-flash-view-model.ts index 2ce56ca2..b766bbcc 100644 --- a/app/phone-ui/onboarding-flash-view-model.ts +++ b/app/phone-ui/onboarding-flash-view-model.ts @@ -53,7 +53,7 @@ export class OnboardingFlashViewModel extends Observable { private flasherUnsubscribers: Array<() => void> = []; private retryAction: () => void = () => this.beginPrompt(); - constructor(options?: { mode?: FlashMode; fromOnboarding?: boolean }) { + constructor(options?: { mode?: FlashMode; fromOnboarding?: boolean; autoStart?: boolean }) { super(); // The flash flow needs the glasses to itself: from here on the main // page must not auto-reconnect, until an install succeeds (below) or @@ -68,6 +68,12 @@ export class OnboardingFlashViewModel extends Observable { "and reflashes the official firmware — removing Faceclaw's custom features." : "This connects to your glasses, asks for confirmation on the lens, checks the battery, then downloads, " + "verifies, and flashes Faceclaw's custom firmware."; + if (options?.autoStart) { + // Entered from a page that already explained what's about to happen + // (the onboarding firmware check), so the intro/"Connect & Confirm" + // step would be redundant: go straight to connecting. + void this.beginPrompt(); + } } // Kept short to fit the glasses' ~50-column text grid. diff --git a/app/phone-ui/onboarding-unpair-page.xml b/app/phone-ui/onboarding-unpair-page.xml index d11c9ee6..2fa4f8e0 100644 --- a/app/phone-ui/onboarding-unpair-page.xml +++ b/app/phone-ui/onboarding-unpair-page.xml @@ -7,7 +7,7 @@ text="Your glasses can only be connected to one app or phone at a time. If they're connected to another app (such as Even Realities or MentraOS) or another phone, disconnect them there before continuing. If nothing else is connected, you can continue." class="body-text m-t-24" textWrap="true" />