From a7a5005e8d7935f1408aca3e7f52cbd3ad769bee Mon Sep 17 00:00:00 2001 From: James Babcock Date: Tue, 25 Aug 2026 21:29:06 -0700 Subject: [PATCH] Move the "Disconnect the Even App" page to before pairing rather than after, and make some minor changes to it --- app/phone-ui/config-page.ts | 4 ++-- app/phone-ui/config-view-model.ts | 4 ++-- .../onboarding-firmware-check-view-model.ts | 6 +++++- app/phone-ui/onboarding-unpair-page.xml | 6 +++--- app/phone-ui/onboarding-unpair-view-model.ts | 19 +++++++++++++++---- app/phone-ui/onboarding-view-model.ts | 14 ++++++-------- app/phone-ui/pairing-page.ts | 6 +++--- app/phone-ui/pairing-view-model.ts | 6 +++--- 8 files changed, 39 insertions(+), 26 deletions(-) diff --git a/app/phone-ui/config-page.ts b/app/phone-ui/config-page.ts index 9b9e3edc..301d0039 100644 --- a/app/phone-ui/config-page.ts +++ b/app/phone-ui/config-page.ts @@ -4,8 +4,8 @@ import { ConfigViewModel } from "./config-view-model"; export function navigatingTo(args: NavigatedData): void { const page = args.object as Page; - // Preserve the model across back-navigation (returning from the unpair page) - // so the onboarding "Continue" flow isn't lost. + // Preserve the model across back-navigation (returning from the firmware + // check page) so the onboarding "Continue" flow isn't lost. if (!page.bindingContext) { const context = (args.context as { onboarding?: boolean } | undefined) ?? undefined; page.bindingContext = new ConfigViewModel({ onboarding: context?.onboarding ?? false }); diff --git a/app/phone-ui/config-view-model.ts b/app/phone-ui/config-view-model.ts index 40a78dad..00f3a24b 100644 --- a/app/phone-ui/config-view-model.ts +++ b/app/phone-ui/config-view-model.ts @@ -232,8 +232,8 @@ export class ConfigViewModel extends Observable { return; } if (this.onboarding) { - // Continue the onboarding chain: unpair the official app next. - Frame.topmost()?.navigate({ moduleName: "phone-ui/onboarding-unpair-page" }); + // Continue the onboarding chain: check the glasses' firmware next. + Frame.topmost()?.navigate({ moduleName: "phone-ui/onboarding-firmware-check-page" }); } } diff --git a/app/phone-ui/onboarding-firmware-check-view-model.ts b/app/phone-ui/onboarding-firmware-check-view-model.ts index c1fe5477..ff8ace3b 100644 --- a/app/phone-ui/onboarding-firmware-check-view-model.ts +++ b/app/phone-ui/onboarding-firmware-check-view-model.ts @@ -125,7 +125,11 @@ export class OnboardingFirmwareCheckViewModel extends Observable { frame.goBack(); return; } - frame?.navigate({ moduleName: "phone-ui/onboarding-unpair-page", clearHistory: true }); + frame?.navigate({ + moduleName: "phone-ui/pairing-page", + context: { onboarding: true }, + clearHistory: true, + }); } /** Escape hatch when the check itself fails: flash as if stock firmware had been detected. */ diff --git a/app/phone-ui/onboarding-unpair-page.xml b/app/phone-ui/onboarding-unpair-page.xml index 175869e0..558f2a1a 100644 --- a/app/phone-ui/onboarding-unpair-page.xml +++ b/app/phone-ui/onboarding-unpair-page.xml @@ -2,11 +2,11 @@ -