Keep Pair phone pending until Gateway is pairable

Do not clear the durable pairing flag when the Gateway pane appears before status refresh. Retry after refresh and when status becomes pairable.

Author: jatinkrmalik

Sources/VocaMac/App/VocaMacApp.swift

@@ -91,9 +91,10 @@ final class SettingsWindowManager: ObservableObject {
         return page
     }
 
-    /// Returns whether a pair-phone sheet was requested, then clears the flag.
-    func consumePendingPairingPresentation() -> Bool {
-        guard pendingPairingPresentation else { return false }
+    /// Consumes the pair-phone request only when the Gateway pane can show the sheet.
+    /// Leaves the flag set otherwise so a later pairable/ready status can retry.
+    func consumePendingPairingPresentation(canPresent: Bool) -> Bool {
+        guard pendingPairingPresentation, canPresent else { return false }
         pendingPairingPresentation = false
         return true
     }

Sources/VocaMac/Views/GatewaySettingsTab.swift

@@ -201,6 +201,7 @@ struct GatewaySettingsTab: View {
         .formStyle(.grouped)
         .task {
             await gateway.refreshStatus()
+            presentPendingPairingIfNeeded()
         }
         .onAppear {
             presentPendingPairingIfNeeded()
@@ -209,6 +210,10 @@ struct GatewaySettingsTab: View {
             guard pending else { return }
             presentPendingPairingIfNeeded()
         }
+        .onChange(of: gateway.status) { _, status in
+            guard status.allowsPairing else { return }
+            presentPendingPairingIfNeeded()
+        }
         .sheet(isPresented: $showingPairSheet) {
             GatewayPairPhoneSheet(
                 payloadRaw: gateway.pairingPayload?.qrPayloadString
@@ -223,10 +228,10 @@ struct GatewaySettingsTab: View {
     }
 
     private func presentPendingPairingIfNeeded() {
-        guard settingsWindowManager.consumePendingPairingPresentation() else { return }
-        if gateway.status.allowsPairing {
-            showingPairSheet = true
-        }
+        guard settingsWindowManager.consumePendingPairingPresentation(
+            canPresent: gateway.status.allowsPairing
+        ) else { return }
+        showingPairSheet = true
     }
 
     private var isStopDisabled: Bool {

Tests/VocaMacTests/SettingsWindowManagerTests.swift

@@ -25,9 +25,20 @@ final class SettingsWindowManagerTests: XCTestCase {
         manager.recordOpenRequest(page: .gateway, showPairing: true)
 
         XCTAssertTrue(manager.pendingPairingPresentation)
-        XCTAssertTrue(manager.consumePendingPairingPresentation())
+        XCTAssertTrue(manager.consumePendingPairingPresentation(canPresent: true))
+        XCTAssertFalse(manager.pendingPairingPresentation)
+        XCTAssertFalse(manager.consumePendingPairingPresentation(canPresent: true))
+    }
+
+    func testPairingPresentationIsNotConsumedUntilPresentable() {
+        let manager = SettingsWindowManager()
+        manager.recordOpenRequest(page: .gateway, showPairing: true)
+
+        XCTAssertTrue(manager.pendingPairingPresentation)
+        XCTAssertFalse(manager.consumePendingPairingPresentation(canPresent: false))
+        XCTAssertTrue(manager.pendingPairingPresentation)
+        XCTAssertTrue(manager.consumePendingPairingPresentation(canPresent: true))
         XCTAssertFalse(manager.pendingPairingPresentation)
-        XCTAssertFalse(manager.consumePendingPairingPresentation())
     }
 
     func testPairingRequestDefaultsToGatewayPage() {
@@ -37,7 +48,7 @@ final class SettingsWindowManagerTests: XCTestCase {
         XCTAssertEqual(manager.requestedPage, .gateway)
         XCTAssertTrue(manager.pendingPairingPresentation)
         XCTAssertEqual(manager.consumeRequestedPage(), .gateway)
-        XCTAssertTrue(manager.consumePendingPairingPresentation())
+        XCTAssertTrue(manager.consumePendingPairingPresentation(canPresent: true))
     }
 
     func testPageRequestDoesNotImplyPairing() {