From 32236ada9f44e744c238ae98a9fe5f93e6e7875f Mon Sep 17 00:00:00 2001
From: "Sameer .I. Siddiqui" <admin@babahumor.com>
Date: Tue, 10 Nov 2026 18:31:41 +0530
Subject: [PATCH 1/4] fix(android): preserve user gesture for native thermal
 printing

---
 .../[saleId]/receipt-print-actions.tsx        | 57 ++++++++++++++-----
 .../pos/receipts/[saleId]/receipt.css         |  7 +++
 src/lib/pos/native-print.ts                   | 31 ++++++++--
 tests/native-print-client.test.ts             | 51 ++++++++++++++++-
 4 files changed, 125 insertions(+), 21 deletions(-)

diff --git a/src/app/(dashboard)/dashboard/pos/receipts/[saleId]/receipt-print-actions.tsx b/src/app/(dashboard)/dashboard/pos/receipts/[saleId]/receipt-print-actions.tsx
index 973e1a44d..313894525 100644
--- a/src/app/(dashboard)/dashboard/pos/receipts/[saleId]/receipt-print-actions.tsx
+++ b/src/app/(dashboard)/dashboard/pos/receipts/[saleId]/receipt-print-actions.tsx
@@ -1,8 +1,12 @@
 "use client";
 
-import { useEffect, useRef, useState, useSyncExternalStore } from "react";
+import { type MouseEvent, useEffect, useRef, useState, useSyncExternalStore } from "react";
 import { isAndroidInstalledClient, printThermalBle } from "@/lib/pos/thermal-ble";
-import { printViaNativeBridge } from "@/lib/pos/native-print";
+import {
+  nativePrintIsExpired,
+  prepareNativePrint,
+  type PreparedNativePrint,
+} from "@/lib/pos/native-print";
 import type { ThermalPaper, ThermalReceipt } from "@/lib/pos/thermal-receipt";
 
 function subscribeInstalledApp(onChange: () => void) {
@@ -48,6 +52,11 @@ export function ReceiptPrintActions({
   );
   const [printing, setPrinting] = useState(false);
   const [message, setMessage] = useState<string | null>(null);
+  const [preparedNative, setPreparedNative] = useState<
+    (PreparedNativePrint & { saleId: string; paper: ThermalPaper }) | null
+  >(null);
+  const readyNative =
+    preparedNative?.saleId === saleId && preparedNative.paper === paper ? preparedNative : null;
 
   useEffect(() => {
     if (!auto || triggered.current || environment !== "browser") return;
@@ -56,20 +65,33 @@ export function ReceiptPrintActions({
     return () => window.clearTimeout(id);
   }, [auto, environment]);
 
-  async function printNative() {
+  async function prepareNative() {
     if (printing) return;
     setPrinting(true);
+    setPreparedNative(null);
     setMessage(null);
     try {
-      await printViaNativeBridge(saleId, paper);
-      setMessage("Opening the printer screen in the MenuMinute app…");
+      const prepared = await prepareNativePrint(saleId, paper, window.location.href);
+      setPreparedNative({ ...prepared, saleId, paper });
+      setMessage("Receipt ready for two minutes. Tap Open printer to choose your device.");
     } catch (error) {
-      setMessage(error instanceof Error ? error.message : "Could not start printing.");
+      setMessage(error instanceof Error ? error.message : "Could not prepare printing.");
     } finally {
       setPrinting(false);
     }
   }
 
+  // This callback runs synchronously on a fresh link click, with no awaited network work.
+  function openNative(event: MouseEvent<HTMLAnchorElement>) {
+    if (!readyNative || nativePrintIsExpired(readyNative)) {
+      event.preventDefault();
+      setPreparedNative(null);
+      setMessage("This print request expired. Tap Prepare receipt again.");
+      return;
+    }
+    setMessage("Opening the MenuMinute printer screen…");
+  }
+
   async function printBluetooth() {
     if (printing) return;
     setPrinting(true);
@@ -97,14 +119,21 @@ export function ReceiptPrintActions({
   return (
     <div className="receipt-print-actions">
       {environment === "ble" && nativePrint && (
-        <button
-          type="button"
-          onClick={() => void printNative()}
-          disabled={printing}
-          className="receipt-print-button"
-        >
-          Print thermal receipt (Bluetooth / USB)
-        </button>
+        <>
+          <button
+            type="button"
+            onClick={() => void prepareNative()}
+            disabled={printing}
+            className="receipt-print-button"
+          >
+            {printing ? "Preparing receipt…" : "Prepare thermal receipt (Bluetooth / USB)"}
+          </button>
+          {readyNative && (
+            <a href={readyNative.intentUrl} onClick={openNative} className="receipt-print-button">
+              Open printer (Bluetooth / USB)
+            </a>
+          )}
+        </>
       )}
       {environment === "ble" && (
         <button
diff --git a/src/app/(dashboard)/dashboard/pos/receipts/[saleId]/receipt.css b/src/app/(dashboard)/dashboard/pos/receipts/[saleId]/receipt.css
index 05ee4231b..33e85bc7d 100644
--- a/src/app/(dashboard)/dashboard/pos/receipts/[saleId]/receipt.css
+++ b/src/app/(dashboard)/dashboard/pos/receipts/[saleId]/receipt.css
@@ -40,6 +40,13 @@
   font-weight: 700;
   cursor: pointer;
 }
+.receipt-toolbar a.receipt-print-button {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  text-decoration: none;
+}
 .receipt-paper {
   width: 72mm;
   max-width: 100%;
diff --git a/src/lib/pos/native-print.ts b/src/lib/pos/native-print.ts
index 37cf306fb..6344ab396 100644
--- a/src/lib/pos/native-print.ts
+++ b/src/lib/pos/native-print.ts
@@ -16,8 +16,18 @@ export function buildNativePrintIntentUrl(grant: string, fallbackUrl: string): s
   );
 }
 
-/** Must be called from a user gesture: Chrome only follows intent: navigations after a tap. */
-export async function printViaNativeBridge(saleId: string, paper: ThermalPaper): Promise<void> {
+/** Prepared asynchronously; the browser must launch the intent on a subsequent direct tap. */
+export interface PreparedNativePrint {
+  intentUrl: string;
+  expiresAtMs: number;
+}
+
+/** Never navigate to intent:// after awaiting fetch: Chrome may have lost user activation. */
+export async function prepareNativePrint(
+  saleId: string,
+  paper: ThermalPaper,
+  fallbackUrl: string
+): Promise<PreparedNativePrint> {
   const response = await fetch(
     `/api/pos/receipts/${encodeURIComponent(saleId)}/native-print-grant`,
     {
@@ -32,7 +42,18 @@ export async function printViaNativeBridge(saleId: string, paper: ThermalPaper):
     const problem = (await response.json().catch(() => null)) as { message?: string } | null;
     throw new Error(problem?.message ?? "Could not start printing. Use Print / save PDF.");
   }
-  const body = (await response.json()) as { grant?: unknown };
-  if (typeof body.grant !== "string") throw new Error("Could not start printing.");
-  window.location.href = buildNativePrintIntentUrl(body.grant, window.location.href);
+  const body = (await response.json()) as { grant?: unknown; expiresAt?: unknown };
+  const expiresAtMs = typeof body.expiresAt === "string" ? Date.parse(body.expiresAt) : NaN;
+  if (typeof body.grant !== "string" || !Number.isFinite(expiresAtMs) || expiresAtMs <= Date.now()) {
+    throw new Error("Could not prepare a valid print request. Please try again.");
+  }
+  return {
+    intentUrl: buildNativePrintIntentUrl(body.grant, fallbackUrl),
+    expiresAtMs,
+  };
+}
+
+/** Recheck expiry immediately before following the prepared link. */
+export function nativePrintIsExpired(prepared: PreparedNativePrint, nowMs = Date.now()): boolean {
+  return prepared.expiresAtMs <= nowMs + 1000;
 }
diff --git a/tests/native-print-client.test.ts b/tests/native-print-client.test.ts
index 324864a21..54cce8c5f 100644
--- a/tests/native-print-client.test.ts
+++ b/tests/native-print-client.test.ts
@@ -1,5 +1,12 @@
-import { describe, expect, it } from "vitest";
-import { ANDROID_PACKAGE, buildNativePrintIntentUrl } from "../src/lib/pos/native-print";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import {
+  ANDROID_PACKAGE,
+  buildNativePrintIntentUrl,
+  nativePrintIsExpired,
+  prepareNativePrint,
+} from "../src/lib/pos/native-print";
+
+afterEach(() => vi.unstubAllGlobals());
 
 describe("native print intent URL", () => {
   it("is restricted to the MenuMinute package and carries only the grant", () => {
@@ -19,3 +26,43 @@ describe("native print intent URL", () => {
       expect(() => buildNativePrintIntentUrl(bad, "https://x")).toThrow();
   });
 });
+
+describe("two-tap native print handoff", () => {
+  it("prepares an intent without navigating after the asynchronous request", async () => {
+    const grant = "abc_DEF-123.sig_456-xyz";
+    const expiresAt = new Date(Date.now() + 120_000).toISOString();
+    const fetchMock = vi.fn().mockResolvedValue(
+      new Response(JSON.stringify({ grant, expiresAt }), { status: 200 })
+    );
+    vi.stubGlobal("fetch", fetchMock);
+
+    const prepared = await prepareNativePrint(
+      "sale-1", "80", "https://food.bababuilds.com/dashboard/pos/receipts/sale-1"
+    );
+    expect(fetchMock).toHaveBeenCalledWith(
+      "/api/pos/receipts/sale-1/native-print-grant",
+      expect.objectContaining({ method: "POST", credentials: "same-origin" })
+    );
+    expect(prepared.intentUrl).toBe(
+      buildNativePrintIntentUrl(grant, "https://food.bababuilds.com/dashboard/pos/receipts/sale-1")
+    );
+    expect(nativePrintIsExpired(prepared)).toBe(false);
+    expect(nativePrintIsExpired(prepared, prepared.expiresAtMs)).toBe(true);
+  });
+
+  it("rejects expired and malformed grant responses before exposing a print link", async () => {
+    for (const body of [
+      { grant: "abc.def", expiresAt: new Date(Date.now() - 1000).toISOString() },
+      { grant: "abc.def", expiresAt: "not-a-date" },
+      { grant: 42, expiresAt: new Date(Date.now() + 120_000).toISOString() },
+    ]) {
+      vi.stubGlobal(
+        "fetch",
+        vi.fn().mockResolvedValue(new Response(JSON.stringify(body), { status: 200 }))
+      );
+      await expect(
+        prepareNativePrint("sale-1", "58", "https://food.bababuilds.com/dashboard/pos")
+      ).rejects.toThrow();
+    }
+  });
+});

From ced37af75cd735af9ffa4d3fe1e8cddf2143d891 Mon Sep 17 00:00:00 2001
From: "Sameer .I. Siddiqui" <admin@babahumor.com>
Date: Tue, 10 Nov 2026 18:32:25 +0530
Subject: [PATCH 2/4] test(android): lock navigation divider keys to Android
 Browser Helper contract

---
 android/app/src/main/AndroidManifest.xml | 3 +++
 tests/android-launch-manifest.test.ts    | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index cbe0c2d00..2aee1bb5f 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -60,6 +60,9 @@
             <meta-data
                 android:name="android.support.customtabs.trusted.NAVIGATION_BAR_COLOR_DARK"
                 android:resource="@color/mm_navigation_bar_dark" />
+            <!-- Intentional upstream Android Browser Helper spelling:
+                 LauncherActivityMetadata uses "androix", not "androidx", for divider keys.
+                 Renaming this apparent typo makes ABH ignore the theme divider colours. -->
             <meta-data
                 android:name="androix.browser.trusted.NAVIGATION_BAR_DIVIDER_COLOR"
                 android:resource="@color/mm_navigation_divider" />
diff --git a/tests/android-launch-manifest.test.ts b/tests/android-launch-manifest.test.ts
index f567ac76f..40cd92a92 100644
--- a/tests/android-launch-manifest.test.ts
+++ b/tests/android-launch-manifest.test.ts
@@ -57,6 +57,15 @@ describe("Android Browser Helper startup manifest completeness", () => {
     expect(label.length).toBeLessThanOrEqual(14);
   });
 
+  it("matches Android Browser Helper's literal navigation-divider metadata keys", () => {
+    // GoogleChrome/android-browser-helper LauncherActivityMetadata uses "androix" here.
+    // This is an upstream typo in the published contract, not a typo in our manifest.
+    for (const key of ["NAVIGATION_BAR_DIVIDER_COLOR", "NAVIGATION_BAR_DIVIDER_COLOR_DARK"]) {
+      expect(application).toContain(`android:name="androix.browser.trusted.${key}"`);
+      expect(application).not.toContain(`android:name="androidx.browser.trusted.${key}"`);
+    }
+  });
+
   it("keeps merchant deep links in the app and diner menus in the browser", () => {
     for (const prefix of ["/api/app/launch", "/app", "/login", "/dashboard", "/kitchen", "/invite"])
       expect(application).toContain(`android:pathPrefix="${prefix}"`);

From 36623cc99f0342fe5e82885c3d2be7ce08692b90 Mon Sep 17 00:00:00 2001
From: "Sameer .I. Siddiqui" <admin@babahumor.com>
Date: Tue, 10 Nov 2026 18:32:49 +0530
Subject: [PATCH 3/4] test(qr-studio): scope Playwright to the single visible
 route tree

---
 tests/e2e/menu-product.spec.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/menu-product.spec.ts b/tests/e2e/menu-product.spec.ts
index 214712b40..bb97e2c90 100644
--- a/tests/e2e/menu-product.spec.ts
+++ b/tests/e2e/menu-product.spec.ts
@@ -651,9 +651,15 @@ test("Tabletop Press is responsive and uses real QR media for all printable form
   await page.getByRole("button", { name: "Sign in", exact: true }).click();
   await expect(page).toHaveURL(/dashboard/);
   await page.goto("/dashboard/qr-codes");
-  const studio = page.getByTestId("tabletop-press");
+  // Next App Router may briefly retain an inactive route tree during navigation.
+  // Require exactly one VISIBLE studio so genuine duplicate active UIs still fail,
+  // instead of matching both the visible section and a hidden retained tree.
+  const studio = page.locator('#workspace-main [data-testid="tabletop-press"]:visible');
+  await expect(studio).toHaveCount(1);
   await expect(studio.getByRole("heading", { name: /Print once/ })).toBeVisible();
-  await expect(studio.getByLabel("QR inventory at a glance")).toBeVisible();
+  const inventory = studio.getByRole("region", { name: "QR inventory at a glance" });
+  await expect(inventory).toHaveCount(1);
+  await expect(inventory).toBeVisible();
   await expect(studio.getByRole("heading", { name: "Your QR library" })).toBeVisible();
   await studio.locator('summary[aria-label="About Active codes"]').click();
   await expect(studio.getByText("Currently usable permanent destination tokens.")).toBeVisible();

From ef122448712d881e3a15db59045953c0149f4815 Mon Sep 17 00:00:00 2001
From: "Sameer .I. Siddiqui" <admin@babahumor.com>
Date: Tue, 10 Nov 2026 18:35:50 +0530
Subject: [PATCH 4/4] style: apply pinned Prettier formatting to native print
 tests

---
 src/lib/pos/native-print.ts       |  6 +++++-
 tests/native-print-client.test.ts | 10 ++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/lib/pos/native-print.ts b/src/lib/pos/native-print.ts
index 6344ab396..75013b2de 100644
--- a/src/lib/pos/native-print.ts
+++ b/src/lib/pos/native-print.ts
@@ -44,7 +44,11 @@ export async function prepareNativePrint(
   }
   const body = (await response.json()) as { grant?: unknown; expiresAt?: unknown };
   const expiresAtMs = typeof body.expiresAt === "string" ? Date.parse(body.expiresAt) : NaN;
-  if (typeof body.grant !== "string" || !Number.isFinite(expiresAtMs) || expiresAtMs <= Date.now()) {
+  if (
+    typeof body.grant !== "string" ||
+    !Number.isFinite(expiresAtMs) ||
+    expiresAtMs <= Date.now()
+  ) {
     throw new Error("Could not prepare a valid print request. Please try again.");
   }
   return {
diff --git a/tests/native-print-client.test.ts b/tests/native-print-client.test.ts
index 54cce8c5f..1ebd840ee 100644
--- a/tests/native-print-client.test.ts
+++ b/tests/native-print-client.test.ts
@@ -31,13 +31,15 @@ describe("two-tap native print handoff", () => {
   it("prepares an intent without navigating after the asynchronous request", async () => {
     const grant = "abc_DEF-123.sig_456-xyz";
     const expiresAt = new Date(Date.now() + 120_000).toISOString();
-    const fetchMock = vi.fn().mockResolvedValue(
-      new Response(JSON.stringify({ grant, expiresAt }), { status: 200 })
-    );
+    const fetchMock = vi
+      .fn()
+      .mockResolvedValue(new Response(JSON.stringify({ grant, expiresAt }), { status: 200 }));
     vi.stubGlobal("fetch", fetchMock);
 
     const prepared = await prepareNativePrint(
-      "sale-1", "80", "https://food.bababuilds.com/dashboard/pos/receipts/sale-1"
+      "sale-1",
+      "80",
+      "https://food.bababuilds.com/dashboard/pos/receipts/sale-1"
     );
     expect(fetchMock).toHaveBeenCalledWith(
       "/api/pos/receipts/sale-1/native-print-grant",